diff options
Diffstat (limited to 'meta-openstack/recipes-devtools')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch b/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch index b2417d7..4472ad0 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/0001-sqlalchemy-fix-grouping-for-postgresql-databases.patch | |||
| @@ -18,20 +18,21 @@ diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sql | |||
| 18 | index 0e5df7008c5e..697f51136c37 100644 | 18 | index 0e5df7008c5e..697f51136c37 100644 |
| 19 | --- a/ceilometer/storage/impl_sqlalchemy.py | 19 | --- a/ceilometer/storage/impl_sqlalchemy.py |
| 20 | +++ b/ceilometer/storage/impl_sqlalchemy.py | 20 | +++ b/ceilometer/storage/impl_sqlalchemy.py |
| 21 | @@ -674,8 +674,14 @@ class Connection(base.Connection): | 21 | @@ -674,8 +674,15 @@ class Connection(base.Connection): |
| 22 | group_attributes = [getattr(models.Sample, g) for g in groupby] | 22 | group_attributes = [getattr(models.Sample, g) for g in groupby] |
| 23 | select.extend(group_attributes) | 23 | select.extend(group_attributes) |
| 24 | 24 | ||
| 25 | - query = session.query(*select).filter( | 25 | - query = session.query(*select).filter( |
| 26 | - models.Meter.id == models.Sample.meter_id) | 26 | - models.Meter.id == models.Sample.meter_id) |
| 27 | + # Group by Meter.unit for postgresql queries | 27 | + # Group by Meter.unit for postgresql queries |
| 28 | + # In mysql this doesn't change anything because one meter has one unit | 28 | + # In mysql this doesn't change anything because one meter has one unit |
| 29 | + | 29 | + |
| 30 | + # mysql: | 30 | + # mysql: |
| 31 | + # query = session.query(*select).filter( | 31 | + # query = session.query(*select).filter( |
| 32 | + # models.Meter.id == models.Sample.meter_id) | 32 | + # models.Meter.id == models.Sample.meter_id) |
| 33 | + # postgres: | 33 | + # postgres: |
| 34 | + query = session.query(*select).group_by(models.Meter.unit) | 34 | + query = session.query(*select).filter( |
| 35 | + models.Meter.id == models.Sample.meter_id).group_by(models.Meter.unit) | ||
| 35 | 36 | ||
| 36 | if groupby: | 37 | if groupby: |
| 37 | query = query.group_by(*group_attributes) | 38 | query = query.group_by(*group_attributes) |