openstack/neutron
Code Issues Proposed changes

Merge "Always add unique sort keys when sorting"

Browse Source
This commit is contained in:
Jenkins
2017-01-26 08:59:11 +00:00
committed by Gerrit Code Review
parent 4157c2888e 519d7ccc2c
commit 2092935b57
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: if sorts:
sort_keys = db_utils.get_and_validate_sort_keys(sorts, model) sort_keys = db_utils.get_and_validate_sort_keys(sorts, model)
sort_dirs = db_utils.get_sort_dirs(sorts, page_reverse) sort_dirs = db_utils.get_sort_dirs(sorts, page_reverse)
if limit: # we always want deterministic results for sorted queries
# we always want deterministic results for limit subqueries # so add unique keys to limit queries when present.
# so add unique keys to limit queries when present. # (http://docs.sqlalchemy.org/en/latest/orm/
# (http://docs.sqlalchemy.org/en/latest/orm/ # loading_relationships.html#subqueryload-ordering)
# loading_relationships.html#subqueryload-ordering) # (http://docs.sqlalchemy.org/en/latest/faq/
# (http://docs.sqlalchemy.org/en/latest/faq/ # ormconfiguration.html#faq-subqueryload-limit-sort)
# ormconfiguration.html#faq-subqueryload-limit-sort) for k in self._unique_keys(model, marker_obj):
for k in self._unique_keys(model, marker_obj): if k not in sort_keys:
if k not in sort_keys: sort_keys.append(k)
sort_keys.append(k) sort_dirs.append('asc')
sort_dirs.append('asc')
collection = sa_utils.paginate_query(collection, model, limit, collection = sa_utils.paginate_query(collection, model, limit,
marker=marker_obj, marker=marker_obj,
sort_keys=sort_keys, sort_keys=sort_keys,