Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sort-on multiple indexes is broken#81 #82

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

sort-on multiple indexes is broken#81 #82

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
697719c
Fixed: Can no longer sort after more than one index #92
volkerjaenisch Aug 12, 2019
6eaef16
New testclass Dummy2. Segments att1 index on the first and second hal…
volkerjaenisch Aug 16, 2019
8a9608c
Good test with limit = 50
volkerjaenisch Aug 16, 2019
78fd575
Better test data
volkerjaenisch Aug 20, 2019
bab34d7
explicit multi column tests
volkerjaenisch Aug 22, 2019
88de79d
Better output of the test context
volkerjaenisch Aug 24, 2019
85611a5
Fix for #81 sorting with multiple indexes while limit or batching app…
volkerjaenisch Aug 29, 2019
5686c7a
Flake8
volkerjaenisch Aug 29, 2019
1ff6b5f
Bugfix: Do return the actual_result_count from _multi_index_sort.
volkerjaenisch Aug 29, 2019
87f0149
Flake8
volkerjaenisch Aug 29, 2019
9141f94
Utilizing the index to get all documents belonging to an index value.
volkerjaenisch Sep 8, 2019
a17c1f7
Merge branch 'master' into bettertests
Feb 10, 2021
cedeca3
Merge branch 'master' into bettertests
jensens Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Products/ZCatalog/Catalog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,8 +907,11 @@ def _sort_nbest_reverse(self, actual_result_count, result, rs,
# This document is not in the sort key index, skip it.
actual_result_count -= 1
else:
if n >= limit and key >= best:
continue
try:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar code is present in the companion _sort_nbest, too. If the change is necessary here, almost surely, it will be necessary there as well.

if n >= limit and key >= best:
continue
except:
pass
i = bisect(keys, key)
keys.insert(i, key)
result.insert(i, (full_key, did, self.__getitem__))
Expand Down
Loading