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

timeseries_limit should not be required for phase 2 (#4581)

Browse Source
This commit is contained in:
michellethomas 2018-03-13 09:25:14 -07:00 committed by Maxime Beauchemin
parent 8951990d6e
commit 1d0ec9fe6e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'