Merge pull request getredash#134 from alison985/m6_replay_non_athena

adds data_scanned attempt to athenaupstream
washort · Jul 19, 2017 · b2d4d8b · b2d4d8b
2 parents e8fb6dc + 0b09144
commit b2d4d8b
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
@@ -157,7 +157,12 @@ def run_query(self, query, user):
             column_tuples = [(i[0], _TYPE_MAPPINGS.get(i[1], None)) for i in cursor.description]
             columns = self.fetch_columns(column_tuples)
             rows = [dict(zip(([c['name'] for c in columns]), r)) for i, r in enumerate(cursor.fetchall())]
-            data = {'columns': columns, 'rows': rows, 'data_scanned': 'upstream'}
+            qbytes = 'upstream2'
+            try:
+                qbytes = cursor.data_scanned_in_bytes()
+            except AttributeError as e:
+                debug("Athena Upstream can't get data_scanned_in_bytes: %s", e)
+            data = {'columns': columns, 'rows': rows, 'data_scanned': qbytes }
             json_data = json.dumps(data, cls=JSONEncoder)
             error = None
         except KeyboardInterrupt: