mistercrunch closed pull request #4581: Making timeseries_limit not required for phase 2 URL: https://github.com/apache/incubator-superset/pull/4581
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py index a16baf1039..dafc2c22fa 100644 --- a/superset/connectors/druid/models.py +++ b/superset/connectors/druid/models.py @@ -1066,10 +1066,7 @@ def run_query( # noqa / druid if not is_timeseries: granularity = 'all' - if ( - granularity == 'all' or - timeseries_limit is None or - timeseries_limit == 0): + if granularity == 'all': phase = 1 inner_from_dttm = inner_from_dttm or from_dttm inner_to_dttm = inner_to_dttm or to_dttm @@ -1148,7 +1145,8 @@ def run_query( # noqa / druid client.topn(**pre_qry) 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( client.query_builder.last_query.query_dict, indent=2) query_str += '\n' ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services