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

[hotfix] druid dist_bar viz issues with non-str x values

Browse Source
This commit is contained in:
Maxime Beauchemin 2016-11-04 00:59:26 +00:00
parent 62987077fa
commit ea189790f1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
caravel/models.py
View File

@ -1869,7 +1869,8 @@ class DruidDatasource(Model, AuditMixinNullable, Queryable):
""" """
# TODO refactor into using a TBD Query object # TODO refactor into using a TBD Query object
qry_start_dttm = datetime.now() qry_start_dttm = datetime.now()
if not is_timeseries:
granularity = 'all'
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
@ -1957,10 +1958,10 @@ class DruidDatasource(Model, AuditMixinNullable, Queryable):
del qry['dimensions'] del qry['dimensions']
client.timeseries(**qry) client.timeseries(**qry)
if len(groupby) == 1: if len(groupby) == 1:
if not timeseries_limit:
timeseries_limit = 1000
qry['threshold'] = timeseries_limit qry['threshold'] = timeseries_limit or 1000
if row_limit and granularity == 'all':
qry['threshold'] = row_limit
qry['dimension'] = list(qry.get('dimensions'))[0] qry['dimension'] = list(qry.get('dimensions'))[0]
del qry['dimensions'] del qry['dimensions']
qry['metric'] = list(qry['aggregations'].keys())[0] qry['metric'] = list(qry['aggregations'].keys())[0]

2
caravel/viz.py
View File

@ -1382,7 +1382,7 @@ class DistributionBarViz(DistributionPieViz):
d = { d = {
"key": series_title, "key": series_title,
"values": [ "values": [
{'x': i, 'y': v} {'x': str(i), 'y': v}
for i, v in ys.iteritems()] for i, v in ys.iteritems()]
} }
chart_data.append(d) chart_data.append(d)