pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 08:39:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed single extraction dimension error (#3796)

Browse Source
This commit is contained in:
Jeff Niu 2017-11-07 21:35:56 -08:00 committed by Maxime Beauchemin
parent 17623f71d4
commit dee47864c4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
superset/connectors/druid/models.py
View File

@ -973,7 +973,13 @@ class DruidDatasource(Model, BaseDatasource):
if len(groupby) == 0 and not having_filters:
del qry['dimensions']
client.timeseries(**qry)
if not having_filters and len(groupby) == 1 and order_desc:
if (
not having_filters and
len(groupby) == 1 and
order_desc and
not isinstance(list(qry.get('dimensions'))[0], dict)
):
dim = list(qry.get('dimensions'))[0]
if timeseries_limit_metric:
order_by = timeseries_limit_metric
@ -995,7 +1001,7 @@ class DruidDatasource(Model, BaseDatasource):
if phase == 1:
return query_str
query_str += (
"//\nPhase 2 (built based on phase one's results)\n")
"// Phase 2 (built based on phase one's results)\n")
df = client.export_pandas()
qry['filter'] = self._add_filter_from_pre_query_data(
df,
@ -1037,7 +1043,7 @@ class DruidDatasource(Model, BaseDatasource):
if phase == 1:
return query_str
query_str += (
"//\nPhase 2 (built based on phase one's results)\n")
"// Phase 2 (built based on phase one's results)\n")
df = client.export_pandas()
qry['filter'] = self._add_filter_from_pre_query_data(
df,