summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Chung <chungg@ca.ibm.com>2014-04-09 13:01:50 -0400
committerDirk Mueller <dirk@dmllr.de>2014-08-14 17:36:39 +0200
commit0ba75c8711341ddd4beac19b287c3c1f6ac0f3e0 (patch)
treefac543020944a0cd0f680ddf00f85cadce32c915
parentea457c6a306abf53b29bec3e1dd8b42d2c88cbf7 (diff)
downloadceilometer-0ba75c8711341ddd4beac19b287c3c1f6ac0f3e0.tar.gz
fix statistics query in postgres
when aggregate functions present, postgres requires all non-aggregate columns selected to be included in group by clause to ensure a single value is selected. Change-Id: Iccbcd8046cca872e8eba472f48fa392114f34426 Closes-Bug: #1256318 (cherry picked from commit 551bbbb0dff43d22d7cca7826af1b3ef5868168b)
-rw-r--r--ceilometer/storage/impl_sqlalchemy.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometer/storage/impl_sqlalchemy.py b/ceilometer/storage/impl_sqlalchemy.py
index 0e5df700..87d2a44e 100644
--- a/ceilometer/storage/impl_sqlalchemy.py
+++ b/ceilometer/storage/impl_sqlalchemy.py
@@ -675,7 +675,8 @@ class Connection(base.Connection):
select.extend(group_attributes)
query = session.query(*select).filter(
- models.Meter.id == models.Sample.meter_id)
+ models.Meter.id == models.Sample.meter_id)\
+ .group_by(models.Meter.unit)
if groupby:
query = query.group_by(*group_attributes)