Return __time in Druid scan (apache#4504)

* Return __time in Druid scan * use constant instead of __timestamp * Fix lint
john-bodley · Mar 9, 2018 · 1647004 · 1647004
1 parent c6af488
commit 1647004
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/superset/assets/visualizations/deckgl/layers/scatter.jsx b/superset/assets/visualizations/deckgl/layers/scatter.jsx
@@ -14,7 +14,7 @@ import { unitToRadius } from '../../../javascripts/modules/geo';
 import sandboxedEval from '../../../javascripts/modules/sandbox';
 
 function getStep(timeGrain) {
-  // grain in microseconds
+  // grain in milliseconds
   const MINUTE = 60 * 1000;
   const HOUR = 60 * MINUTE;
   const DAY = 24 * HOUR;

diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
@@ -130,7 +130,8 @@ def get_datasources(self):
         return json.loads(requests.get(endpoint).text)
 
     def get_druid_version(self):
-        endpoint = self.get_base_coordinator_url() + '/status'
+        endpoint = self.get_base_url(
+            self.coordinator_host, self.coordinator_port) + '/status'
         return json.loads(requests.get(endpoint).text)['version']
 
     def refresh_datasources(
@@ -1114,6 +1115,7 @@ def run_query(  # noqa / druid
         order_direction = 'descending' if order_desc else 'ascending'
 
         if columns:
+            columns.append('__time')
             del qry['post_aggregations']
             del qry['aggregations']
             qry['dimensions'] = columns

diff --git a/superset/viz.py b/superset/viz.py
@@ -2039,7 +2039,7 @@ def get_properties(self, d):
             'radius': self.fixed_value if self.fixed_value else d.get(self.metric),
             'cat_color': d.get(self.dim) if self.dim else None,
             'position': d.get('spatial'),
-            '__timestamp': d.get('__timestamp'),
+            '__timestamp': d.get(DTTM_ALIAS) or d.get('__time'),
         }
 
     def get_data(self, df):