Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Overhaul site_stats table

Browse source 
The site stats table holds a bunch of metric fields, two of which are of
data type "bigint unsigned", 3 are "bigint" (signed) and one is int
(signed).  Also the default values differ widely: It is 0 on the
"unsigned" fields and the "int" field, but -1 on the three others. This
patch makes all of this more consistent:

Set all fields (except the ss_row_id, which isn't changed) data type to
"bigint unsigned". Also set NULL as the default value for all those
fields. Obviously -1 isn't a possible default value any more. Also, 0
can easily be mistaken for a real value (e.g. ss_active_users=0 -->
"there is nobody active on this wiki"). NULL, by it's definition, is the
value of choice for a value to insert into fields of which we don't know
a correct value.

The respective patch files were tested locally against MySql, Sqlite,
Postgres and SQL Server 2016. Neither oracle nor the upgrade with
update.php was tested.

Bug: T56888
Change-Id: I7d42aae434852a56b6f8dd559d8a5f3bce416021
This commit is contained in:
Eddie Greiner-Petter 2017-05-08 21:31:54 +02:00 committed by Krinkle
parent abeca9ac48
commit 27c76fa4ae
14 changed files with 128 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/installer/MssqlUpdater.php
View file

@ -120,6 +120,7 @@ class MssqlUpdater extends DatabaseUpdater {
[ 'addTable', 'actor', 'patch-actor-table.sql' ],
[ 'migrateActors' ],
[ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
[ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ],
];
}

1
includes/installer/MysqlUpdater.php
View file

@ -340,6 +340,7 @@ class MysqlUpdater extends DatabaseUpdater {
[ 'addTable', 'actor', 'patch-actor-table.sql' ],
[ 'migrateActors' ],
[ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
[ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ],
];
}

1
includes/installer/OracleUpdater.php
View file

@ -140,6 +140,7 @@ class OracleUpdater extends DatabaseUpdater {
[ 'migrateArchiveText' ],
[ 'addTable', 'actor', 'patch-actor-table.sql' ],
[ 'migrateActors' ],
[ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ],
// KEEP THIS AT THE BOTTOM!!
[ 'doRebuildDuplicateFunction' ],

1
includes/installer/PostgresUpdater.php
View file

@ -533,6 +533,7 @@ class PostgresUpdater extends DatabaseUpdater {
[ 'addPgIndex', 'logging', 'logging_actor_type_time', '( log_actor, log_type, log_timestamp )' ],
[ 'addPgIndex', 'logging', 'logging_actor_time', '( log_actor, log_timestamp )' ],
[ 'migrateActors' ],
[ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ],
];
}

1
includes/installer/SqliteUpdater.php
View file

@ -204,6 +204,7 @@ class SqliteUpdater extends DatabaseUpdater {
[ 'addTable', 'actor', 'patch-actor-table.sql' ],
[ 'migrateActors' ],
[ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ],
[ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ],
];
}

7
maintenance/archives/patch-site_stats-modify.sql Normal file
View file

@ -0,0 +1,7 @@
ALTER TABLE /*_*/site_stats
ALTER ss_total_edits SET DEFAULT NULL,
ALTER ss_good_articles SET DEFAULT NULL,
MODIFY COLUMN ss_total_pages bigint unsigned DEFAULT NULL,
MODIFY COLUMN ss_users bigint unsigned DEFAULT NULL,
MODIFY COLUMN ss_active_users bigint unsigned DEFAULT NULL,
MODIFY COLUMN ss_images bigint unsigned DEFAULT NULL;

32
maintenance/mssql/archives/patch-site_stats-modify.sql Normal file
View file

@ -0,0 +1,32 @@
/* Delete old default constraints */
DECLARE @sql nvarchar(max)
SET @sql=''
/* IMHO: A DBMS where you have to do THIS to change a default value sucks. */
SELECT @sql= @sql + 'ALTER TABLE site_stats DROP CONSTRAINT ' + df.name + '; '
FROM sys.default_constraints df
JOIN sys.columns c
ON c.object_id = df.parent_object_id
AND c.column_id = df.parent_column_id
WHERE
df.parent_object_id = OBJECT_ID('site_stats');--
EXEC sp_executesql @sql;
/* Change data type of ss_images from int to bigint.
* All other fields (except ss_row_id) already are bigint.
* This MUST happen before adding new constraints. */
ALTER TABLE site_stats ALTER COLUMN ss_images bigint;
/* Add new default constraints.
* Don't ask me why I have to repeat ALTER TABLE site_stats
* instead of using commas, for some reason SQL Server 2016
* didn't accept it in any other way. Maybe I just don't know
* enough about mssql, but this works.
*/
ALTER TABLE site_stats ADD CONSTRAINT col_ss_total_edits DEFAULT NULL FOR ss_total_edits;
ALTER TABLE site_stats ADD CONSTRAINT col_ss_good_article DEFAULT NULL FOR ss_good_articles;
ALTER TABLE site_stats ADD CONSTRAINT col_ss_total_pages DEFAULT NULL FOR ss_total_pages;
ALTER TABLE site_stats ADD CONSTRAINT col_ss_users DEFAULT NULL FOR ss_users;
ALTER TABLE site_stats ADD CONSTRAINT col_ss_active_users DEFAULT NULL FOR ss_active_users;
ALTER TABLE site_stats ADD CONSTRAINT col_ss_images DEFAULT NULL FOR ss_images;

26
maintenance/mssql/tables.sql
View file

@ -591,26 +591,22 @@ CREATE TABLE /*_*/site_stats (
ss_row_id int NOT NULL CONSTRAINT /*i*/ss_row_id PRIMARY KEY,
-- Total number of edits performed.
ss_total_edits bigint default 0,
ss_total_edits bigint default NULL,
-- An approximate count of pages matching the following criteria:
-- * in namespace 0
-- * not a redirect
-- * contains the text '[['
-- See Article::isCountable() in includes/Article.php
ss_good_articles bigint default 0,
-- See SiteStatsInit::articles().
ss_good_articles bigint default NULL,
-- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except faster
ss_total_pages bigint default '-1',
-- Total pages, theoretically equal to SELECT COUNT(*) FROM page.
ss_total_pages bigint default NULL,
-- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
ss_users bigint default '-1',
-- Number of users, theoretically equal to SELECT COUNT(*) FROM user.
ss_users bigint default NULL,
-- Number of users that still edit
ss_active_users bigint default '-1',
-- Number of users that still edit.
ss_active_users bigint default NULL,
-- Number of images, equivalent to SELECT COUNT(*) FROM image
ss_images int default 0
-- Number of images, equivalent to SELECT COUNT(*) FROM image.
ss_images bigint default NULL
);

7
maintenance/oracle/archives/patch-site_stats-modify.sql Normal file
View file

@ -0,0 +1,7 @@
ALTER TABLE /*_*/site_stats
ALTER ss_total_edits SET DEFAULT NULL,
ALTER ss_good_articles SET DEFAULT NULL,
ALTER ss_total_pages SET DEFAULT NULL,
ALTER ss_users SET DEFAULT NULL,
ALTER ss_active_users SET DEFAULT NULL,
ALTER ss_images SET DEFAULT NULL;

12
maintenance/oracle/tables.sql
View file

@ -457,12 +457,12 @@ CREATE UNIQUE INDEX &mw_prefix.iwlinks_ui02 ON &mw_prefix.iwlinks (iwl_prefix, i
CREATE TABLE &mw_prefix.site_stats (
ss_row_id NUMBER NOT NULL PRIMARY KEY,
ss_total_edits NUMBER DEFAULT 0,
ss_good_articles NUMBER DEFAULT 0,
ss_total_pages NUMBER DEFAULT -1,
ss_users NUMBER DEFAULT -1,
ss_active_users NUMBER DEFAULT -1,
ss_images NUMBER DEFAULT 0
ss_total_edits NUMBER DEFAULT NULL,
ss_good_articles NUMBER DEFAULT NULL,
ss_total_pages NUMBER DEFAULT NULL,
ss_users NUMBER DEFAULT NULL,
ss_active_users NUMBER DEFAULT NULL,
ss_images NUMBER DEFAULT NULL
);
CREATE SEQUENCE ipblocks_ipb_id_seq;

7
maintenance/postgres/archives/patch-site_stats-modify.sql Normal file
View file

@ -0,0 +1,7 @@
ALTER TABLE /*_*/site_stats
ALTER ss_total_edits SET DEFAULT NULL,
ALTER ss_good_articles SET DEFAULT NULL,
ALTER ss_total_pages SET DEFAULT NULL,
ALTER ss_users SET DEFAULT NULL,
ALTER ss_active_users SET DEFAULT NULL,
ALTER ss_images SET DEFAULT NULL;

14
maintenance/postgres/tables.sql
View file

@ -370,13 +370,13 @@ CREATE INDEX langlinks_lang_title ON langlinks (ll_lang,ll_title);
CREATE TABLE site_stats (
ss_row_id INTEGER NOT NULL PRIMARY KEY DEFAULT 0,
ss_total_edits INTEGER DEFAULT 0,
ss_good_articles INTEGER DEFAULT 0,
ss_total_pages INTEGER DEFAULT -1,
ss_users INTEGER DEFAULT -1,
ss_active_users INTEGER DEFAULT -1,
ss_admins INTEGER DEFAULT -1,
ss_images INTEGER DEFAULT 0
ss_total_edits INTEGER DEFAULT NULL,
ss_good_articles INTEGER DEFAULT NULL,
ss_total_pages INTEGER DEFAULT NULL,
ss_users INTEGER DEFAULT NULL,
ss_active_users INTEGER DEFAULT NULL,
ss_admins INTEGER DEFAULT NULL,
ss_images INTEGER DEFAULT NULL
);

35
maintenance/sqlite/archives/patch-site_stats-modify.sql Normal file
View file

@ -0,0 +1,35 @@
DROP TABLE IF EXISTS /*_*/site_stats_tmp;
-- Create the temporary table. The following part
-- is copied & pasted from the changed tables.sql
-- file besides having an other table name.
CREATE TABLE /*_*/site_stats_tmp (
ss_row_id int unsigned NOT NULL PRIMARY KEY,
ss_total_edits bigint unsigned default NULL,
ss_good_articles bigint unsigned default NULL,
ss_total_pages bigint unsigned default NULL,
ss_users bigint unsigned default NULL,
ss_active_users bigint unsigned default NULL,
ss_images bigint unsigned default NULL
) /*$wgDBTableOptions*/;
-- Move the data from the old to the new table
INSERT OR IGNORE INTO /*_*/site_stats_tmp (
ss_row_id,
ss_total_edits,
ss_good_articles,
ss_total_pages,
ss_active_users,
ss_images
) SELECT
ss_row_id,
ss_total_edits,
ss_good_articles,
ss_total_pages,
ss_active_users,
ss_images
FROM /*_*/site_stats;
DROP TABLE /*_*/site_stats;
ALTER TABLE /*_*/site_stats_tmp RENAME TO /*_*/site_stats;

26
maintenance/tables.sql
View file

@ -988,26 +988,22 @@ CREATE TABLE /*_*/site_stats (
ss_row_id int unsigned NOT NULL PRIMARY KEY,
-- Total number of edits performed.
ss_total_edits bigint unsigned default 0,
ss_total_edits bigint unsigned default NULL,
-- An approximate count of pages matching the following criteria:
-- * in namespace 0
-- * not a redirect
-- * contains the text '[['
-- See Article::isCountable() in includes/Article.php
ss_good_articles bigint unsigned default 0,
-- See SiteStatsInit::articles().
ss_good_articles bigint unsigned default NULL,
-- Total pages, theoretically equal to SELECT COUNT(*) FROM page; except faster
ss_total_pages bigint default '-1',
-- Total pages, theoretically equal to SELECT COUNT(*) FROM page.
ss_total_pages bigint unsigned default NULL,
-- Number of users, theoretically equal to SELECT COUNT(*) FROM user;
ss_users bigint default '-1',
-- Number of users, theoretically equal to SELECT COUNT(*) FROM user.
ss_users bigint unsigned default NULL,
-- Number of users that still edit
ss_active_users bigint default '-1',
-- Number of users that still edit.
ss_active_users bigint unsigned default NULL,
-- Number of images, equivalent to SELECT COUNT(*) FROM image
ss_images int default 0
-- Number of images, equivalent to SELECT COUNT(*) FROM image.
ss_images bigint unsigned default NULL
) /*$wgDBTableOptions*/;
--