Yurik has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325719 )
Change subject: Add another schema version
......................................................................
Add another schema version
Just keeps existing data flowing, new parameter will be taken into
account as part of T152559.
Bug: T152513
Change-Id: Iff4cab884cc2a318e3f521ba3ba45e926a568881
Depends-On: Ieb757994f91d4f2760dc4919c322abca5200fc0a
---
M interactive/events-all.sql
M interactive/events.sql
2 files changed, 35 insertions(+), 0 deletions(-)
Approvals:
Yurik: Verified; Looks good to me, approved
diff --git a/interactive/events-all.sql b/interactive/events-all.sql
index 2f56c5b..83be802 100644
--- a/interactive/events-all.sql
+++ b/interactive/events-all.sql
@@ -8,4 +8,18 @@
timestamp >= '{from_timestamp}'
AND timestamp < '{to_timestamp}'
GROUP BY event_action, event_feature
+
+UNION ALL
+
+SELECT
+ DATE(timestamp) AS day,
+ event_action AS action,
+ event_feature AS feature,
+ SUM(event_sampling) AS events
+ FROM Kartographer_16132745
+ WHERE
+ timestamp >= '{from_timestamp}'
+ AND timestamp < '{to_timestamp}'
+ GROUP BY event_action, event_feature
+
;
diff --git a/interactive/events.sql b/interactive/events.sql
index e25c0ff..1eeb699 100644
--- a/interactive/events.sql
+++ b/interactive/events.sql
@@ -16,4 +16,25 @@
AND timestamp >= '{from_timestamp}'
AND timestamp < '{to_timestamp}'
GROUP BY event_action, event_feature
+
+UNION ALL
+
+SELECT
+ DATE(timestamp) AS day,
+ event_action AS action,
+ event_feature AS feature,
+ SUM(event_sampling) AS events
+ FROM Kartographer_16132745, metawiki.sites
+ WHERE
+ wiki = site_global_key
+ AND (
+ '{family}' = 'all'
+ -- Non-special wikis
+ OR site_group = '{family}'
+ -- site_group for 'metawiki' is 'meta', etc
+ OR ( '{family}' = 'special' AND INSTR(wiki, site_group) = 0 )
+ )
+ AND timestamp >= '{from_timestamp}'
+ AND timestamp < '{to_timestamp}'
+ GROUP BY event_action, event_feature
;
--
To view, visit https://gerrit.wikimedia.org/r/325719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff4cab884cc2a318e3f521ba3ba45e926a568881
Gerrit-PatchSet: 2
Gerrit-Project: analytics/discovery-stats
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>
Gerrit-Reviewer: Bearloga <[email protected]>
Gerrit-Reviewer: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
