[MediaWiki-commits] [Gerrit] Hack to give stats user access to hive on stat1002 - change (analytics/reportupdater-queries)
Milimetric has submitted this change and it was merged.
Change subject: Hack to give stats user access to hive on stat1002
..
Hack to give stats user access to hive on stat1002
Change-Id: I6ab6cea58d56a6a61bd1e819d8c185b3c8be689a
---
M browser/desktop_and_mobile_web_by_browser
M browser/desktop_and_mobile_web_by_os
M browser/desktop_and_mobile_web_by_os_and_browser
M browser/mobile_web_by_browser
M browser/mobile_web_by_os
5 files changed, 35 insertions(+), 95 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/browser/desktop_and_mobile_web_by_browser
b/browser/desktop_and_mobile_web_by_browser
index 499899b..71200ae 100755
--- a/browser/desktop_and_mobile_web_by_browser
+++ b/browser/desktop_and_mobile_web_by_browser
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
browser_family,
browser_major,
SUM(view_count) as view_count
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
browser_family,
browser_major
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os
b/browser/desktop_and_mobile_web_by_os
index c713fae..4b8a0e4 100755
--- a/browser/desktop_and_mobile_web_by_os
+++ b/browser/desktop_and_mobile_web_by_os
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
os_family,
os_major,
SUM(view_count) as view_count
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
os_family,
os_major
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os_and_browser
b/browser/desktop_and_mobile_web_by_os_and_browser
index 7cdd7b3..dcf0457 100755
--- a/browser/desktop_and_mobile_web_by_os_and_browser
+++ b/browser/desktop_and_mobile_web_by_os_and_browser
@@ -1,13 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
os_family,
os_major,
browser_family,
@@ -16,10 +10,10 @@
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
os_family,
os_major,
browser_family,
@@ -27,10 +21,4 @@
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/mobile_web_by_browser b/browser/mobile_web_by_browser
index c3afe60..4ac5083 100755
--- a/browser/mobile_web_by_browser
+++ b/
[MediaWiki-commits] [Gerrit] Hack to give stats user access to hive on stat1002 - change (analytics/reportupdater-queries)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275132
Change subject: Hack to give stats user access to hive on stat1002
..
Hack to give stats user access to hive on stat1002
Change-Id: I6ab6cea58d56a6a61bd1e819d8c185b3c8be689a
---
M browser/desktop_and_mobile_web_by_browser
M browser/desktop_and_mobile_web_by_os
M browser/desktop_and_mobile_web_by_os_and_browser
M browser/mobile_web_by_browser
M browser/mobile_web_by_os
5 files changed, 35 insertions(+), 95 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries
refs/changes/32/275132/1
diff --git a/browser/desktop_and_mobile_web_by_browser
b/browser/desktop_and_mobile_web_by_browser
index 499899b..71200ae 100755
--- a/browser/desktop_and_mobile_web_by_browser
+++ b/browser/desktop_and_mobile_web_by_browser
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
browser_family,
browser_major,
SUM(view_count) as view_count
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
browser_family,
browser_major
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os
b/browser/desktop_and_mobile_web_by_os
index c713fae..4b8a0e4 100755
--- a/browser/desktop_and_mobile_web_by_os
+++ b/browser/desktop_and_mobile_web_by_os
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
os_family,
os_major,
SUM(view_count) as view_count
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
os_family,
os_major
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os_and_browser
b/browser/desktop_and_mobile_web_by_os_and_browser
index 7cdd7b3..dcf0457 100755
--- a/browser/desktop_and_mobile_web_by_os_and_browser
+++ b/browser/desktop_and_mobile_web_by_os_and_browser
@@ -1,13 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric
--silent=true --outputformat=tsv2 -e "
SELECT
-'{start_date}' AS date,
+'$1' AS date,
os_family,
os_major,
browser_family,
@@ -16,10 +10,10 @@
FROM wmf.browser_general
WHERE
access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >=
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) <
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1'
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
GROUP BY
-'{start_date}',
+'$1',
os_family,
os_major,
browser_family,
@@ -27,10 +21,4 @@
ORDER BY view_count DESC
LIMIT 1000
;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/mobile_web_by_browser b/browser/mobile_web_by_browser
