mirror of
https://github.com/apache/superset.git
synced 2024-09-12 08:39:45 -04:00
timeseries_limit should not be required for phase 2 (#4581)
This commit is contained in:
parent
8951990d6e
commit
1d0ec9fe6e
@ -1068,10 +1068,7 @@ class DruidDatasource(Model, BaseDatasource):
|
|||||||
if not is_timeseries:
|
if not is_timeseries:
|
||||||
granularity = 'all'
|
granularity = 'all'
|
||||||
|
|
||||||
if (
|
if granularity == 'all':
|
||||||
granularity == 'all' or
|
|
||||||
timeseries_limit is None or
|
|
||||||
timeseries_limit == 0):
|
|
||||||
phase = 1
|
phase = 1
|
||||||
inner_from_dttm = inner_from_dttm or from_dttm
|
inner_from_dttm = inner_from_dttm or from_dttm
|
||||||
inner_to_dttm = inner_to_dttm or to_dttm
|
inner_to_dttm = inner_to_dttm or to_dttm
|
||||||
@ -1151,7 +1148,8 @@ class DruidDatasource(Model, BaseDatasource):
|
|||||||
|
|
||||||
client.topn(**pre_qry)
|
client.topn(**pre_qry)
|
||||||
logging.info('Phase 1 Complete')
|
logging.info('Phase 1 Complete')
|
||||||
query_str += '// Two phase query\n// Phase 1\n'
|
if phase == 2:
|
||||||
|
query_str += '// Two phase query\n// Phase 1\n'
|
||||||
query_str += json.dumps(
|
query_str += json.dumps(
|
||||||
client.query_builder.last_query.query_dict, indent=2)
|
client.query_builder.last_query.query_dict, indent=2)
|
||||||
query_str += '\n'
|
query_str += '\n'
|
||||||
|
Loading…
Reference in New Issue
Block a user