Merge pull request #1340 from glogiotatidis/issue-1285-stop-pulling-d…

…ata-redshift [Fix #1285] Stop pulling data from RedShift.
mozmeao · Mar 24, 2020 · 5dfb7f7 · 5dfb7f7
2 parents df6b726 + 79774ff
commit 5dfb7f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/snippets/base/etl.py b/snippets/base/etl.py
@@ -11,10 +11,12 @@
 
 
 REDASH_QUERY_IDS = {
-    'redshift-job': 68135,
     'bq-job': 68136,
-    'redshift-impressions': 68345,
     'bq-impressions': 68341,
+
+    # Not currently used but kept here for reference.
+    'redshift-job': 68135,
+    'redshift-impressions': 68345,
 }
 
 redash = RedashDynamicQuery(
@@ -145,10 +147,7 @@ def prosses_rows(rows, key='message_id'):
 
 
 def update_job_metrics(date):
-    rows = []
-    for query in ['redshift-job', 'bq-job']:
-        rows += redash_rows(query, date)
-
+    rows = redash_rows('bq-job', date)
     processed = prosses_rows(rows, key='message_id')
     with atomic():
         JobDailyPerformance.objects.filter(date=date).delete()
@@ -162,11 +161,7 @@ def update_job_metrics(date):
 
 
 def update_impressions(date):
-    rows = []
-
-    for query in ['redshift-impressions', 'bq-impressions']:
-        rows += redash_rows(query, date)
-
+    rows = redash_rows('bq-impressions', date)
     details = []
     for row in rows:
         # Normalize channel name, based on what kind of snippets they get.

diff --git a/snippets/base/tests/test_etl.py b/snippets/base/tests/test_etl.py
@@ -84,9 +84,7 @@ def test_base(self):
                     'channel': 'demo',
                     'country_code': 'GR',
                     'counts': 5,
-                }
-            ],
-            [
+                },
                 {
                     'message_id': '1000',
                     'event_context': '',
@@ -225,8 +223,6 @@ def test_base(self):
                         'counts': 10,
                         'duration': '5',
                     },
-                ],
-                [
                     {
                         'channel': 'release',
                         'counts': 2,