openstack/neutron
Code Issues Proposed changes

Always add unique sort keys when sorting

Browse Source 
This avoids the logs being filled with warnings from
the sort utils about unstable sorting order.

"Unique keys not in sort_keys. The sorting order may be unstable."

Change-Id: I5cba69eb87abf1bec15fcc675369a725d67e23ce
This commit is contained in:
Kevin Benton
2017-01-20 19:53:33 -08:00
parent 2eaadd4050
commit 519d7ccc2c
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
neutron/db/common_db_mixin.py
View File

@@ -222,17 +222,16 @@ class CommonDbMixin(object):
if sorts:
sort_keys = db_utils.get_and_validate_sort_keys(sorts, model)
sort_dirs = db_utils.get_sort_dirs(sorts, page_reverse)
if limit:
# we always want deterministic results for limit subqueries
# so add unique keys to limit queries when present.
# (http://docs.sqlalchemy.org/en/latest/orm/
# loading_relationships.html#subqueryload-ordering)
# (http://docs.sqlalchemy.org/en/latest/faq/
# ormconfiguration.html#faq-subqueryload-limit-sort)
for k in self._unique_keys(model, marker_obj):
if k not in sort_keys:
sort_keys.append(k)
sort_dirs.append('asc')
# we always want deterministic results for sorted queries
# so add unique keys to limit queries when present.
# (http://docs.sqlalchemy.org/en/latest/orm/
# loading_relationships.html#subqueryload-ordering)
# (http://docs.sqlalchemy.org/en/latest/faq/
# ormconfiguration.html#faq-subqueryload-limit-sort)
for k in self._unique_keys(model, marker_obj):
if k not in sort_keys:
sort_keys.append(k)
sort_dirs.append('asc')
collection = sa_utils.paginate_query(collection, model, limit,
marker=marker_obj,
sort_keys=sort_keys,