openstack/aodh
Code Issues Proposed changes

Merge "[SQLalchemy] Add groupby ability resource_metadata"

Browse Source
This commit is contained in:
Jenkins
2014-12-18 15:26:33 +00:00
committed by Gerrit Code Review
parent 817314e726 f1439a1fe4
commit e8834630e5
1 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ceilometer/storage/impl_sqlalchemy.py
View File

@@ -614,18 +614,33 @@ class Connection(base.Connection):
session = self._engine_facade.get_session() session = self._engine_facade.get_session()
if groupby: if groupby:
group_attributes = [getattr(models.Resource, g) for g in groupby] group_attributes = []
for g in groupby:
if g != 'resource_metadata.instance_type':
group_attributes.append(getattr(models.Resource, g))
else:
group_attributes.append(
getattr(models.MetaText, 'value')
.label('resource_metadata.instance_type'))
select.extend(group_attributes) select.extend(group_attributes)
query = (session.query(*select) query = (
.join(models.Meter, session.query(*select)
models.Meter.id == models.Sample.meter_id) .join(models.Meter,
.join( models.Meter.id == models.Sample.meter_id)
models.Resource, .join(models.Resource,
models.Resource.internal_id == models.Sample.resource_id) models.Resource.internal_id == models.Sample.resource_id)
.group_by(models.Meter.unit)) .group_by(models.Meter.unit))
if groupby: if groupby:
for g in groupby:
if g == 'resource_metadata.instance_type':
query = query.join(
models.MetaText,
models.Resource.internal_id == models.MetaText.id)
query = query.filter(
models.MetaText.meta_key == 'instance_type')
query = query.group_by(*group_attributes) query = query.group_by(*group_attributes)
return make_query_from_filter(session, query, sample_filter) return make_query_from_filter(session, query, sample_filter)
@@ -672,7 +687,8 @@ class Connection(base.Connection):
""" """
if groupby: if groupby:
for group in groupby: for group in groupby:
if group not in ['user_id', 'project_id', 'resource_id']: if group not in ['user_id', 'project_id', 'resource_id',
'resource_metadata.instance_type']:
raise ceilometer.NotImplementedError('Unable to group by ' raise ceilometer.NotImplementedError('Unable to group by '
'these fields') 'these fields')