openstack/aodh
Code Issues Proposed changes

Drop foreign key contraints of alarm in sqlalchemy

Browse Source 
This patch drops the foreign key constraints of alarms to user_id and
project_id in sqlalchemy.

Closes-Bug: 1260176
Change-Id: I7336ee1e3f885421db5aae3a30af0e918b79450b
This commit is contained in:
Lianhao Lu
2014-01-06 10:53:00 +08:00
parent fee3cdeb91
commit ecbe240e6b
4 changed files with 84 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ceilometer/storage/impl_sqlalchemy.py
View File

@@ -312,8 +312,6 @@ class Connection(base.Connection):
query = session.query(models.User).filter(
~models.User.id.in_(session.query(models.Meter.user_id)
.group_by(models.Meter.user_id)),
~models.User.id.in_(session.query(models.Alarm.user_id)
.group_by(models.Alarm.user_id)),
~models.User.id.in_(session.query(models.AlarmChange.user_id)
.group_by(models.AlarmChange.user_id))
)
@@ -324,9 +322,6 @@ class Connection(base.Connection):
.filter(~models.Project.id.in_(
session.query(models.Meter.project_id)
.group_by(models.Meter.project_id)),
~models.Project.id.in_(
session.query(models.Alarm.project_id)
.group_by(models.Alarm.project_id)),
~models.Project.id.in_(
session.query(models.AlarmChange.project_id)
.group_by(models.AlarmChange.project_id)),
@@ -729,10 +724,6 @@ class Connection(base.Connection):
"""
session = sqlalchemy_session.get_session()
with session.begin():
Connection._create_or_update(session, models.User,
alarm.user_id)
Connection._create_or_update(session, models.Project,
alarm.project_id)
alarm_row = models.Alarm(id=alarm.alarm_id)
alarm_row.update(alarm.as_dict())
session.add(alarm_row)