From 16470044863555b42bfb2aaddecce68b589d0da1 Mon Sep 17 00:00:00 2001
From: Beto Dealmeida <roberto@dealmeida.net>
Date: Fri, 9 Mar 2018 15:28:11 -0800
Subject: [PATCH] Return __time in Druid scan (#4504)

* Return __time in Druid scan

* use constant instead of __timestamp

* Fix lint
---
 superset/assets/visualizations/deckgl/layers/scatter.jsx | 2 +-
 superset/connectors/druid/models.py                      | 4 +++-
 superset/viz.py                                          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/superset/assets/visualizations/deckgl/layers/scatter.jsx b/superset/assets/visualizations/deckgl/layers/scatter.jsx
index 087df3d7ef..26d320c502 100644
--- 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
index a16baf1039..0541af07e7 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -130,7 +130,8 @@ class DruidCluster(Model, AuditMixinNullable, ImportMixin):
         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 @@ class DruidDatasource(Model, BaseDatasource):
         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
index 9225e5da8f..9bbf53828a 100644
--- a/superset/viz.py
+++ b/superset/viz.py
@@ -2039,7 +2039,7 @@ class DeckScatterViz(BaseDeckGLViz):
             '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):