openstack/nova
Code Issues Proposed changes

Merge "db: Resolve additional SAWarning warnings" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2023-12-19 17:40:14 +00:00 committed by Gerrit Code Review
commit 860d79fb88
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nova/db/sqlalchemy/api.py
View File

@ -4133,6 +4133,12 @@ def _get_fk_stmts(metadata, conn, table, column, records):
fk_column = fk_table.c.id
for fk in fk_table.foreign_keys:
if table != fk.column.table:
# if the foreign key doesn't actually point to the table we're
# archiving entries from then it's not relevant; trying to
# resolve this would result in a cartesian product
continue
# We need to find the records in the referring (child) table that
# correspond to the records in our (parent) table so we can archive
# them.
@ -4179,6 +4185,7 @@ def _get_fk_stmts(metadata, conn, table, column, records):
# deque.
fk_delete = fk_table.delete().where(fk_column.in_(fk_records))
deletes.appendleft(fk_delete)
# Repeat for any possible nested child tables.
i, d = _get_fk_stmts(metadata, conn, fk_table, fk_column, fk_records)
inserts.extendleft(i)

12
nova/objects/cell_mapping.py
View File

@ -279,11 +279,15 @@ class CellMappingList(base.ObjectListBase, base.NovaObject):
# SELECT DISTINCT cell_id FROM instance_mappings \
# WHERE project_id = $project_id;
cell_ids = context.session.query(
api_models.InstanceMapping.cell_id).filter_by(
project_id=project_id).distinct().subquery()
api_models.InstanceMapping.cell_id
).filter_by(
project_id=project_id
).distinct()
# SELECT cell_mappings WHERE cell_id IN ($cell_ids);
return context.session.query(api_models.CellMapping).filter(
api_models.CellMapping.id.in_(cell_ids)).all()
return context.session.query(
api_models.CellMapping).filter(
api_models.CellMapping.id.in_(cell_ids)
).all()
@classmethod
def get_by_project_id(cls, context, project_id):