Mforns has submitted this change and it was merged.
Change subject: Expand to run on all wikis
......................................................................
Expand to run on all wikis
Might as well expand our efforts here - most wikis allow uploads
locally, and the ones that don't won't take much time to run...
Change-Id: I6e69b6cb47ed922ca98b0863ce6b3a60f97134f6
---
M multimedia/config.yaml
M multimedia/new-uploaders.sql
M multimedia/upload-wizard-uploads.sql
M multimedia/uploaders.sql
M multimedia/uploads.sql
5 files changed, 12 insertions(+), 16 deletions(-)
Approvals:
Mforns: Verified; Looks good to me, approved
diff --git a/multimedia/config.yaml b/multimedia/config.yaml
index 16ef955..f3d8228 100644
--- a/multimedia/config.yaml
+++ b/multimedia/config.yaml
@@ -18,29 +18,25 @@
granularity: months
timeboxed: true
starts: 2004-01-01
- explode_by:
- wiki_db: commonswiki, dewiki, enwiki
+ by_wiki: true
uploaders:
frequency: months
granularity: months
timeboxed: true
starts: 2004-01-01
- explode_by:
- wiki_db: commonswiki, dewiki, enwiki
+ by_wiki: true
new-uploaders:
frequency: months
granularity: months
timeboxed: true
starts: 2004-01-01
- explode_by:
- wiki_db: commonswiki, dewiki, enwiki
+ by_wiki: true
upload-wizard-uploads:
frequency: months
granularity: months
timeboxed: true
starts: 2010-01-01
- explode_by:
- wiki_db: commonswiki
+ by_wiki: true
cross-wiki-uploads:
frequency: months
granularity: months
diff --git a/multimedia/new-uploaders.sql b/multimedia/new-uploaders.sql
index 9409cc8..8cee906 100644
--- a/multimedia/new-uploaders.sql
+++ b/multimedia/new-uploaders.sql
@@ -1,7 +1,7 @@
select date('{from_timestamp}') as date,
- count(*) as {wiki_db}
+ count(*) as {wiki}
from (select img_user
- from {wiki_db}.image
+ from {wiki}.image
group by img_user
having min(img_timestamp) >= '{from_timestamp}'
and min(img_timestamp) < '{to_timestamp}'
diff --git a/multimedia/upload-wizard-uploads.sql
b/multimedia/upload-wizard-uploads.sql
index f7e4971..9cafeef 100644
--- a/multimedia/upload-wizard-uploads.sql
+++ b/multimedia/upload-wizard-uploads.sql
@@ -1,6 +1,6 @@
select date('{from_timestamp}') as date,
- count(*) as {wiki_db}
- from {wiki_db}.categorylinks
+ count(*) as {wiki}
+ from {wiki}.categorylinks
where cl_to = 'Uploaded_with_UploadWizard' and
cl_timestamp >= '{from_timestamp}' and
cl_timestamp < '{to_timestamp}';
diff --git a/multimedia/uploaders.sql b/multimedia/uploaders.sql
index 1c89def..4682147 100644
--- a/multimedia/uploaders.sql
+++ b/multimedia/uploaders.sql
@@ -1,5 +1,5 @@
select date('{from_timestamp}') as date,
- count(distinct img_user) as {wiki_db}
- from {wiki_db}.image
+ count(distinct img_user) as {wiki}
+ from {wiki}.image
where img_timestamp >= '{from_timestamp}' and
img_timestamp < '{to_timestamp}';
diff --git a/multimedia/uploads.sql b/multimedia/uploads.sql
index fa20180..ab525cf 100644
--- a/multimedia/uploads.sql
+++ b/multimedia/uploads.sql
@@ -1,5 +1,5 @@
select date('{from_timestamp}') as date,
- count(*) as {wiki_db}
- from {wiki_db}.image
+ count(*) as {wiki}
+ from {wiki}.image
where img_timestamp >= '{from_timestamp}' and
img_timestamp < '{to_timestamp}';
--
To view, visit https://gerrit.wikimedia.org/r/266240
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e69b6cb47ed922ca98b0863ce6b3a60f97134f6
Gerrit-PatchSet: 3
Gerrit-Project: analytics/limn-multimedia-data
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Mforns <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
