[ad-hoc] Fixing type for count distinct (apache#7573)

etr2460 · May 22, 2019 · 6b9790c · 6b9790c
1 parent efb085a
commit 6b9790c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
@@ -932,7 +932,7 @@ def druid_type_from_adhoc_metric(adhoc_metric):
         if aggregate == 'count':
             return 'count'
         if aggregate == 'count_distinct':
-            return 'cardinality'
+            return 'hyperUnique' if column_type == 'hyperunique' else 'cardinality'
         else:
             return column_type + aggregate.capitalize()
 

diff --git a/tests/druid_func_tests.py b/tests/druid_func_tests.py
@@ -771,6 +771,13 @@ def test_druid_type_from_adhoc_metric(self):
         })
         assert(druid_type == 'cardinality')
 
+        druid_type = DruidDatasource.druid_type_from_adhoc_metric({
+            'column': {'type': 'hyperUnique', 'column_name': 'value'},
+            'aggregate': 'COUNT_DISTINCT',
+            'label': 'My Adhoc Metric',
+        })
+        assert(druid_type == 'hyperUnique')
+
     def test_run_query_order_by_metrics(self):
         client = Mock()
         client.query_builder.last_query.query_dict = {'mock': 0}