mirror of
https://github.com/apache/superset.git
synced 2024-09-17 11:09:47 -04:00
Fixed single extraction dimension error (#3796)
This commit is contained in:
parent
17623f71d4
commit
dee47864c4
@ -973,7 +973,13 @@ class DruidDatasource(Model, BaseDatasource):
|
|||||||
if len(groupby) == 0 and not having_filters:
|
if len(groupby) == 0 and not having_filters:
|
||||||
del qry['dimensions']
|
del qry['dimensions']
|
||||||
client.timeseries(**qry)
|
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]
|
dim = list(qry.get('dimensions'))[0]
|
||||||
if timeseries_limit_metric:
|
if timeseries_limit_metric:
|
||||||
order_by = timeseries_limit_metric
|
order_by = timeseries_limit_metric
|
||||||
@ -995,7 +1001,7 @@ class DruidDatasource(Model, BaseDatasource):
|
|||||||
if phase == 1:
|
if phase == 1:
|
||||||
return query_str
|
return query_str
|
||||||
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()
|
df = client.export_pandas()
|
||||||
qry['filter'] = self._add_filter_from_pre_query_data(
|
qry['filter'] = self._add_filter_from_pre_query_data(
|
||||||
df,
|
df,
|
||||||
@ -1037,7 +1043,7 @@ class DruidDatasource(Model, BaseDatasource):
|
|||||||
if phase == 1:
|
if phase == 1:
|
||||||
return query_str
|
return query_str
|
||||||
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()
|
df = client.export_pandas()
|
||||||
qry['filter'] = self._add_filter_from_pre_query_data(
|
qry['filter'] = self._add_filter_from_pre_query_data(
|
||||||
df,
|
df,
|
||||||
|
Loading…
Reference in New Issue
Block a user