Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/176944

Change subject: Update schema versions
......................................................................

Update schema versions

Bug: T76453
Change-Id: I87808b764870b159ba8d31e002f05bf701ffc4c6
---
M actions/template.sql
M duration/template.sql
2 files changed, 22 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia 
refs/changes/44/176944/1

diff --git a/actions/template.sql b/actions/template.sql
index 820726b..1d80fc4 100644
--- a/actions/template.sql
+++ b/actions/template.sql
@@ -58,7 +58,8 @@
        SUM(CASE WHEN event_action = 'options-open' THEN event_samplingFactor 
ELSE 0 END) AS 'options-open',
        SUM(CASE WHEN event_action = 'options-close' THEN event_samplingFactor 
ELSE 0 END) AS 'options-close',
        SUM(CASE WHEN event_action = 'disable-about-link' THEN 
event_samplingFactor ELSE 0 END) AS 'disable-about-link',
-       SUM(CASE WHEN event_action = 'enable-about-link' THEN 
event_samplingFactor ELSE 0 END) AS 'enable-about-link'
+       SUM(CASE WHEN event_action = 'enable-about-link' THEN 
event_samplingFactor ELSE 0 END) AS 'enable-about-link',
+       SUM(CASE WHEN event_action = 'image-unview' THEN event_samplingFactor 
ELSE 0 END) AS 'image-unview'
 
        FROM (
                SELECT timestamp, event_action, 1 AS event_samplingFactor FROM 
MediaViewer_7670440
@@ -85,6 +86,9 @@
                SELECT timestamp, event_action, event_samplingFactor FROM 
MediaViewer_10308479
                        WHERE %wiki% timestamp < TIMESTAMP(CURDATE()) AND 
timestamp >= TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))
                UNION ALL
+               SELECT timestamp, event_action, event_samplingFactor FROM 
MediaViewer_10536413
+                       WHERE %wiki% timestamp < TIMESTAMP(CURDATE()) AND 
timestamp >= TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 30 DAY))
+               UNION ALL
                SELECT timestamp, (CASE WHEN event_value = 0 THEN 
'pref-optout-loggedin' ELSE 'pref-optin-loggedin' END) AS event_action, 1 AS 
event_samplingFactor FROM PrefUpdate_5563398
                        WHERE event_property = 'multimediaviewer-enable' AND 
timestamp < TIMESTAMP(CURDATE()) AND timestamp >= TIMESTAMP(DATE_SUB(CURDATE(), 
INTERVAL 30 DAY))
        ) AS MediaViewerUnioned
diff --git a/duration/template.sql b/duration/template.sql
index e63f7cf..5cc6c59 100644
--- a/duration/template.sql
+++ b/duration/template.sql
@@ -54,8 +54,23 @@
         SUBSTRING_INDEX(SUBSTRING_INDEX(GROUP_CONCAT(event_duration ORDER BY 
event_duration SEPARATOR ','), ',', 95/100*COUNT(*)+1), ',', -1) AS 
mediaviewer_95,
         SUBSTRING_INDEX(SUBSTRING_INDEX(GROUP_CONCAT(event_duration ORDER BY 
event_duration SEPARATOR ','), ',', 99/100*COUNT(*)+1), ',', -1) AS 
mediaviewer_99,
         SUM(event_samplingFactor) AS mediaviewer_population_size
-    FROM
-        MultimediaViewerDuration_8572641
+    FROM (
+        SELECT wiki, timestamp, event_type, event_duration, 
event_samplingFactor FROM MultimediaViewerDuration_8572641
+        WHERE
+            %wiki%
+            event_duration IS NOT NULL
+            AND event_type = 'click-to-first-image'
+            AND timestamp < TIMESTAMP(CURDATE())
+            AND timestamp > TIMESTAMP(CURDATE() - INTERVAL 90 DAY)
+        UNION ALL
+        SELECT wiki, timestamp, event_type, event_duration, 
event_samplingFactor FROM MultimediaViewerDuration_10427980
+        WHERE
+            %wiki%
+            event_duration IS NOT NULL
+            AND event_type = 'click-to-first-image'
+            AND timestamp < TIMESTAMP(CURDATE())
+            AND timestamp > TIMESTAMP(CURDATE() - INTERVAL 90 DAY)
+    ) AS MultimediaViewerDuration_Unioned
     WHERE
         %wiki%
         event_duration IS NOT NULL

-- 
To view, visit https://gerrit.wikimedia.org/r/176944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I87808b764870b159ba8d31e002f05bf701ffc4c6
Gerrit-PatchSet: 1
Gerrit-Project: analytics/multimedia
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to